Fix Gemset management