Some updates to get planegeoms working