Fixed CPP and typo