More changes to get it to compile