Fixes needed to pass checkerboard test.