Minor fixes to post / pre job from testing.