Islet Hell: Bug fixes

Various bug fixes