Followup fixes