Moar build tweaks