Moar build file tweaks