Corrections to get edit subskill working again