Some build configuration changes