Fix path.join thrown errors with expandMapping rename. Closes gh-725.