Fixes for remote build in Dundee.