various tweaks from TIGRESS shakedown