Followup fixes.