Figure creating fixes.