8263 mitigation

This pull request includes two changes to reduce the chances of hitting issue #8263.