Additional fixes for the continuous build.