Some build tweaks