Shapes improvements.