Fixing some remaining flags