Fix a few bugs in previous custom dismissal support.