Project fixes for device builds