Updated references to get it compiling