Fix trailing slashes in System prefixes