Fixed role issues