Fixes on group and roles permissions