Shape data fixes