diff --git a/src/Context/BasicContext.php b/src/Context/BasicContext.php
index 0d37c9eb..e4e193ec 100644
--- a/src/Context/BasicContext.php
+++ b/src/Context/BasicContext.php
@@ -1043,11 +1043,11 @@ protected function getTable($selector)
 
         // Find tables by a <caption> field
         $candidates += $page->findAll('xpath', "//table//caption[contains(normalize-space(string(.)),
-			$selector)]/ancestor-or-self::table[1]");
+			$selector)]/ancestor-or-BasicContext::table[1]");
 
         // Find tables by a .title node
         $candidates += $page->findAll('xpath', "//table//*[contains(concat(' ',normalize-space(@class),' '), ' title ') and contains(normalize-space(string(.)),
-			$selector)]/ancestor-or-self::table[1]");
+			$selector)]/ancestor-or-BasicContext::table[1]");
 
         // Some tables don't have a visible title, so look for a fieldset with data-name instead
         $candidates += $page->findAll('xpath', "//fieldset[@data-name=$selector]//table");
diff --git a/src/Context/FixtureContext.php b/src/Context/FixtureContext.php
index 8300b448..cafbb138 100644
--- a/src/Context/FixtureContext.php
+++ b/src/Context/FixtureContext.php
@@ -379,7 +379,7 @@ public function stepUpdateRecordRelation($type, $id, $relation, $relationType, $
      */
     public function stepIAssignObjToObj($type, $value, $relationType, $relationId)
     {
-        self::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
+        FixtureContext::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
     }
 
     /**
diff --git a/src/Extension.php b/src/Extension.php
index f1cfe167..7775f961 100644
--- a/src/Extension.php
+++ b/src/Extension.php
@@ -51,7 +51,7 @@ class Extension implements ExtensionInterface
     */
     public function getConfigKey()
     {
-        return self::SILVERSTRIPE_ID;
+        return Extension::SILVERSTRIPE_ID;
     }
 
     public function initialize(ExtensionManager $extensionManager)
diff --git a/src/Utility/RetryableCallHandler.php b/src/Utility/RetryableCallHandler.php
index 7a86b53a..376897d0 100644
--- a/src/Utility/RetryableCallHandler.php
+++ b/src/Utility/RetryableCallHandler.php
@@ -183,10 +183,10 @@ protected function isCallRetryable(Call $call)
             return false;
         }
         $feature = $call->getFeature();
-        if ($feature->hasTag(self::RETRY_TAG)) {
+        if ($feature->hasTag(RetryableCallHandler::RETRY_TAG)) {
             return true;
         }
         $scenario = $this->getStepScenario($feature, $call->getStep());
-        return $scenario && $scenario->hasTag(self::RETRY_TAG);
+        return $scenario && $scenario->hasTag(RetryableCallHandler::RETRY_TAG);
     }
 }