Tweaks and corrections: MCU, signaling, etc.