Fixed npcs in gamestate