Fix and re-integrate StoneMaze