several fixes for edge case broken jobs