Job fixes