Final fixes on figures?