Build tweaks, minor fixes