More CX1-specific hacks.