fix some "with" statements