Shape fixes