Fixed squares some more