Trailing slash fixes