Fixed regressions in manipulation system due to inheritance changes.