Change some stuff to maybe in theory work

Though it doesn't actually - can't seem to deploy to the device anymore
either :(