Fix remaining errors