Minor fixes
Merged black and XM overlays