follow up fixes