Core/Creature: Fix problems with neutral innkeepers