Schema job bug fixes