Fixed a few things for if you canceled out of a modal.