role fixes