Fixed more role bugs