Fix the remaining flags