Fix default server values for non-cloud servers