Fixes to FLAG command.