Fixed a couple of build errors

Having emulator issues so leaving it for tonight. To be continued
tomorrow!