more order of ops fixes