Fixed issue with client server mode not canonicalizing the path