Implemented fixes for property names containing legitimate apostrophes, properties that are functions and