some fixes at rollback command