Minor fixes.
Other fixes related to role points.