XMir mode related fixes