Move to using fig for management
fixes to support deployment under fig