diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py
index 5921e60..be44ccc 100644
--- a/src/task/BaseWWTask.py
+++ b/src/task/BaseWWTask.py
@@ -149,7 +149,7 @@ class BaseWWTask(BaseTask, FindFeature, OCR):
             self.mouse_down(key='right')
         self.send_key_down(direction)
         f_found = self.wait_until(lambda: self.find_f_with_text(target_text=target_text), time_out=time_out,
-                                  raise_if_not_found=False)
+                                  raise_if_not_found=False, wait_until_before_delay=0)
         if f_found:
             self.send_key('f')
             self.sleep(0.1)
@@ -179,7 +179,7 @@ class BaseWWTask(BaseTask, FindFeature, OCR):
 
     def handle_claim_button(self):
         if self.wait_feature('claim_cancel_button_hcenter_vcenter', raise_if_not_found=False, horizontal_variance=0.05,
-                             vertical_variance=0.1, time_out=1.5, threshold=0.8):
+                             vertical_variance=0.1, time_out=1.5, threshold=0.8, wait_until_before_delay=0.8):
             self.sleep(0.5)
             self.send_key('esc')
             self.sleep(0.5)
@@ -235,7 +235,8 @@ class BaseWWTask(BaseTask, FindFeature, OCR):
         return super().sleep(timeout - self.check_for_monthly_card())
 
     def wait_in_team_and_world(self, time_out=10, raise_if_not_found=True):
-        return self.wait_until(self.in_team_and_world, time_out=time_out, raise_if_not_found=raise_if_not_found)
+        return self.wait_until(self.in_team_and_world, time_out=time_out, raise_if_not_found=raise_if_not_found,
+                               wait_until_before_delay=0)
 
     def in_team_and_world(self):
         return self.in_team()[