Some build updates