Bug fixes related to user role access