Fixing up config to be more standard