Minor build tweaks