More flag fixes