Simple changes to get code to compile.