fixes for the flag system.