Fixes from cholm to enable reading of geometry from a file