Basic bug fixes for reply parsing.