followup fixes