Fixes due to modeshape refactoring/isolation in s-ramp.