Ambassadors, other minor fixes