Some minor clean up in the build file