Few small fixes/cleanups following tests on Zapro's 5x5x5.