more flag fixes