Fixes to while breaking conditions.