xxmData tweaks