SDModelObject and other fixes