Add fixes to conveyor from test.