some tiny fixes of multi org stuff