Minor changes on geometry utils