Fixing last of the role problems, pending tests