Fixup control point and initial map issues