Minor issue fixes for role