Fix couched lock
Improved CubeManager