[build] some more build tweaks