follow-up fixes