Fixes some compilation issues for other distros

Change-Id: I90d7407614e4282fc22ecc62beebf5a26bfe8c69