Fixed figure problems