fix some nits when using default mechanism