some temp and incremental fixes for job pg race errors