fixing compilation errors in the initial changes