Changes to get code to compile.