Minor tweaks to build files