fixing some issues with roles...