Fixes to GSMat recycling