Further build tweaks