Small logic changes to gain better stability by more strict handling of existing models