some fixes in chisel