roll back some issues