Fixed various issues related the mock-exchange