tidy up the flags a bit