Some build configuration enhancement