Changes required by the refactoring of s-ramp.