Final tweaks for build