Fix roll modal closing error, update discard prep