Isochrone fixes - #1436