More flag tweaking.