Fix up minor breakage