Fixes remaining errors