Fix save on cycle and modified range clamps