updates for Chisel consistency pointed out by Henry