Merge: Minor fixes to support the Turing cluster