Fix assorted failures associated with incorrect owners