Final bugfixes for organization branch