Fix a few cases for responding to questions