Added fixes for Sphere