Update with build fixes for mir-base/mir