more fixes for fig