Minor changes to get the code compiling