Roguelike bugfixes