fix a few classes for new properties access