Some dirty fixes to get MapPolyline to work