Fix a couple of org switcher issues

This fixes #2176 and #2177.