figure fixes