Fixes in some replies

- Some optional data was not being returned.