Fix for abstractproperty, and make things nicer
2 files changed