Hotfixes on island create