Review fixes. Pass along stores and server response fixes