some more outcome fixes