fixes to support deployment under fig