Fixed small issues when several castles.