Some build improvements