Fixed figure bugs