Tweaks to the buildfile