fix flags that got broken (?) by merge