Another flag bug fixes.