Fixed #25 and other property and descendant issues