Fix multipass and cascade problems