several minor build tweaks