Fixes for addApplicationOnlyRole