Fixed some issues with shapes.