Numerous configuration changes