Fixes up remaining errors