diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
index 1c5f1b25c80..3d898de6f47 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
@@ -93,7 +93,7 @@ class SkymarkRocAbility extends TriggeredAbilityImpl {
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls with toughness 2 or less");
-            UUID defenderId = game.getCombat().getDefenderId(sourceId);
+            UUID defenderId = game.getCombat().getDefendingPlayerId(sourceId, game);
             filter.add(new ControllerIdPredicate(defenderId));
             filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 3));
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
index babed4c1a60..7ad2e4f6823 100644
--- a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
+++ b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
@@ -133,9 +133,9 @@ class NorinTheWaryRemovingEffect extends OneShotEffect {
                     delayedAbility.setSourceId(source.getSourceId());
                     delayedAbility.setControllerId(source.getControllerId());
                     game.addDelayedTriggeredAbility(delayedAbility);
-                    return true;
                 }
-            }            
+            }
+            return true;
         }
         return false;
     }