Minor tweaks to build file