Updates to run on Mac and compile on mobile