more build file tweaks