Job q fixes