Minor build tweaks.