Fix role bugs