a few more build tweaks