some fixes for some test.0xdata.com fails