Changed some settings to make it work in both dev and production