Fixes for running the master branch on the UTH nodes

See merge request !2