Changes needed to compile master branch.