Merge pull request #3475 from chipsalliance/fixes

Fixes for latest chisel
8 jobs for dev
in 0 seconds and was queued for 0 seconds