start fixing compilation errors