Minor build tweaks, redirections.