diff --git a/SourceGitBucket/SourceGitBucket.php b/SourceGitBucket/SourceGitBucket.php
index 3256b0c..17bae91 100755
--- a/SourceGitBucket/SourceGitBucket.php
+++ b/SourceGitBucket/SourceGitBucket.php
@@ -64,10 +64,10 @@
 		$t_ref = "";
 
 		if ( !is_null( $p_changeset ) ) {
-			$t_ref = "/tree/$p_changeset->revision";
+			$t_ref = "/commit/$p_changeset->revision";
 		}
 
-		return $p_repo->info['hub_url'] . "/$t_username/$t_reponame$t_ref";
+		return $p_repo->info['hub_url'] . "/$t_reponame$t_ref";
 	}
 
 	public function url_changeset( $p_repo, $p_changeset ) {
@@ -75,7 +75,7 @@
 		$t_reponame = $p_repo->info['hub_reponame'];
 		$t_ref = $p_changeset->revision;
 
-		return $p_repo->info['hub_url'] . "/$t_username/$t_reponame/commit/$t_ref";
+		return $p_repo->info['hub_url'] . "/$t_reponame/commit/$t_ref";
 	}
 
 	public function url_file( $p_repo, $p_changeset, $p_file ) {
@@ -84,7 +84,7 @@
 		$t_ref = $p_changeset->revision;
 		$t_filename = $p_file->filename;
 
-		return $p_repo->info['hub_url'] . "/$t_username/$t_reponame/blob/$t_ref/$t_filename";
+		return $p_repo->info['hub_url'] . "/$t_reponame/blob/$t_ref/$t_filename";
 	}
 
 	public function url_diff( $p_repo, $p_changeset, $p_file ) {
@@ -93,7 +93,7 @@
 		$t_ref = $p_changeset->revision;
 		$t_filename = $p_file->filename;
 
-		return $p_repo->info['hub_url'] . "/$t_username/$t_reponame/commit/$t_ref";
+		return $p_repo->info['hub_url'] . "/$t_reponame/commit/$t_ref";
 	}
 
 	public function update_repo_form( $p_repo )
@@ -265,7 +265,7 @@
 			$t_username = $p_repo->info['hub_username'];
 			$t_reponame = $p_repo->info['hub_reponame'];
 
-			$t_uri = $this->api_uri( $p_repo, "repos/$t_username/$t_reponame/branches" );
+			$t_uri = $this->api_uri( $p_repo, "repos/$t_reponame/branches" );
 			$t_json = $this->api_json_url( $p_repo, $t_uri );
 
 			$t_branches = array();
@@ -326,7 +326,7 @@
 			$t_commit_id = array_shift( $s_parents );
 
 			echo "Retrieving $t_commit_id ... ";
-			$t_uri = $this->api_uri( $p_repo, "repos/$t_username/$t_reponame/commits/$t_commit_id" );
+			$t_uri = $this->api_uri( $p_repo, "repos/$t_reponame/commits/$t_commit_id" );
 			$t_json = $this->api_json_url( $p_repo, $t_uri );
 
 			if ( false === $t_json || is_null( $t_json ) ) {
diff --git a/SourceGitBucket/lang/strings_english.txt b/SourceGitBucket/lang/strings_english.txt
index 539e13a..e62547b 100644
--- a/SourceGitBucket/lang/strings_english.txt
+++ b/SourceGitBucket/lang/strings_english.txt
@@ -10,7 +10,7 @@
 
 $s_plugin_SourceGitBucket_hub_username = 'GitBucket Username';
 $s_plugin_SourceGitBucket_hub_reponame = 'GitBucket Repository Name<br/><span class="small">(no spaces; must match the name as received from the webservice\'s payload)</span>';
-$s_plugin_SourceGitBucket_hub_url = 'GitBucket Repository URL';
+$s_plugin_SourceGitBucket_hub_url = 'GitBucket base URL';
 $s_plugin_SourceGitBucket_hub_pwd = 'GitBucket password';
 
 $s_plugin_SourceGitBucket_hub_app_client_id = 'GitHub Application Client ID<br><span class="small">This is required for private repositories and also allows to get around the <a href="https://developer.github.com/v3/#rate-limiting">Rate Limit</a> when importing data.<br>Create a new <a href="https://github.com/settings/applications">GitHub Application</a> if needed.</span>';