Follow-up fixes