Fix errors introduced by switch away from get by UUID.