* Add missing headers * Cast values to correct types Change-Id: Iaf621c562e884daeb22f6ec700d6989ba6ba1aef