Some minor tweaks to make the build process cleaner