Got rid of all compilation errors