A bunch of configuration changes and fixes