Support source output parent, minor fixes