Import geometry fixes from Python version