Correct apostrophe issues