Spin - fix NPE in new worlds and other small fixes