Clean path fix cont

[PWNIX-287] Additional changes to support clean_path fix.