Fix compiler errors due to changes in configuration.