Fix more flag-related nonsense