Fix Albany master branch build errors.