Merge "Fix extra/missing : in path setup."