Fixes to changes to HasLinearMap and Measure from core.