Fixed Geometry issues