Compilation errors fixed I hope