base: more compilation fixes

Change-Id: I6278f363a351827490159418f51ba45e392a9df8