More fix toward passing working_tpch1.