Reorganize flags and fix duplicate watchdog/microPPM flag