Fix apostrophe issues

Fixes #1523