Fix and add a few responses.