Fixed more bugs include pipe