Logic fixes for geom fix and unfix for POTS