Basic single stage pipe support and cd bugs fix