Minor changes after discovering that this only works on 32bit simulator.