Fixed basic shapes.