Fixes for building

Change-Id: Ibb5d87e2f20f5b41be004653f7be60a4aad61b76
More fixes, sorry should have caught these the first time.

Change-Id: Iffb0fd07e335acd79f9cd67274e8aa0ae6718ef2