Cleanup - fix property attributes, etc. etc.