Some minor fixes and situation handling