Shape-related fixes