CM fix for odd build errors