diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java
index 09e7b3e68b..466c6d360d 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/Element.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java
@@ -551,7 +551,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
         // incorrectly. So instead of just passing through what's been resolved
         // so far, 'null' shall be returned with an error message.
 
-        if (attribute.attributes.size() > 0)                    {
+        if (attribute.attributes.size() > 0) {
             dB.echoError("Unfilled attributes '" + attribute.attributes.toString() + "'" +
                     "for tag <" + attribute.getOrigin() + ">!");
             return "null";
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
index 8dc1cb6996..44d51f14f7 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -424,7 +424,9 @@ else return new Element(PlayerTags.playerChatHistory.get(player_name).get(x - 1)
             }
         }
 
-        if (!isOnline()) return new Element(identify()).getAttribute(attribute);
+        // TODO: Achieve this less terribly (Make it specific to each tag, or reorganize tags so entity-requiring
+        // tags go after this, and offline-working tags go above.)
+        // if (!isOnline()) return new Element(identify()).getAttribute(attribute);
 
         // Player is required to be online after this point...