More fixes for geometry restoration