Some build changes