Minor changes

Fixed a few things to make existing code work with OrgCRUD