Fix issues with refactor, muxr.