Small build file tweaks