Minor changes in mock server