Other fixes (' and " and -)