Squash more errors