More no assignee fixes