Dundee specific settings from JWS2 branch