Add fixes for a build error.