Basic geometry improvements