diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 7acf63c942..69bee7d529 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -165,7 +165,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 	}
 
 	// tack on any additional query vars
-	if ( $redirect_url && $redirect['query'] ) {
+	if ( $redirect_url && !empty($redirect['query']) ) {
 		if ( strpos($redirect_url, '?') !== false )
 			$redirect_url .= '&';
 		else
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 9f5031a507..1346f43fe8 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -62,7 +62,7 @@ function get_category_link( $category_id ) {
 			return $category;
 		$category_nicename = $category->slug;
 
-		if ( $parent == $category_id ) // recursive recursion
+		if ( $category->parent == $category_id ) // recursive recursion
 			$category->parent = 0;
 
 		if ( $parent = $category->parent )