Minor changes in order to get it compiling