Fix delayed Job & Lock requirement/load issues