More figure fixes