fix various bugs post landing of patch for Issue 24