Multiple fixes, flag auto-correct