more flag tweaks