Edit messages for remaining flags #1877