Fix up remaining errors