SQUASH ME: Fix some classification problems