Fix double trailing "/". Add sane defaults.
This will create a new commit in order to revert the existing changes.
