Fix issues so I can build on simulator as well as device