some fixes for test.0xdata.com fails