Updated Role bugs.