Cleanup
Fix issue with path where / is not used as separator