Minor changes to get the code compiling
It compiles!