followups fixes