Tweak flag positions again