More build tweaks.