Fixes to FigManager