Updates of some settings to make it easier to deploy via chef on AWS