More build tweaks