Fix for abstractproperty, and make things nicer