diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java
index 64b64e7b..e54bd25f 100644
--- a/src/com/massivecraft/massivecore/MassiveCoreMConf.java
+++ b/src/com/massivecraft/massivecore/MassiveCoreMConf.java
@@ -7,8 +7,8 @@ import java.util.Map;
 import org.bukkit.permissions.Permissible;
 
 import com.massivecraft.massivecore.command.editor.annotation.EditorName;
-import com.massivecraft.massivecore.command.editor.annotation.EditorNullable;
 import com.massivecraft.massivecore.command.editor.annotation.EditorType;
+import com.massivecraft.massivecore.command.type.TypeMillisDiff;
 import com.massivecraft.massivecore.store.Entity;
 import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.PermUtil;
@@ -30,15 +30,10 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
 	// -------------------------------------------- //
 	// Base command aliases.
 	
-	@EditorNullable(false)
 	public List<String> aliasesMcore = MUtil.list("massivecore", "mcore");
-	@EditorNullable(false)
 	public List<String> aliasesUsys = MUtil.list("usys");
-	@EditorNullable(false)
 	public List<String> aliasesMstore = MUtil.list("massivestore", "mstore");
-	@EditorNullable(false)
 	public List<String> aliasesBuffer = MUtil.list("buffer");
-	@EditorNullable(false)
 	public List<String> aliasesCmdurl = MUtil.list("cmdurl");
 	
 	// -------------------------------------------- //
@@ -56,7 +51,6 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
 	// -------------------------------------------- //
 	// Permission denied formatting.
 	
-	@EditorNullable(false)
 	public Map<String, String> permissionDeniedFormats = MUtil.map(
 		"some.awesome.permission.node", "<b>You must be awesome to %s<b>.",
 		"some.derp.permission.node.1", "derp",
@@ -79,7 +73,6 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
 	// -------------------------------------------- //
 	// Teleportation delay permissions.
 	
-	@EditorNullable(false)
 	public Map<String, Integer> permissionToTpdelay = MUtil.map(
 		"massivecore.notpdelay", 0,
 		"default", 10
@@ -122,8 +115,11 @@ public class MassiveCoreMConf extends Entity<MassiveCoreMConf>
 	// -------------------------------------------- //
 	// The database system.
 	
+	@EditorType(TypeMillisDiff.class)
 	public volatile long millisBetweenLocalPoll = TimeUnit.MILLIS_PER_MINUTE * 5;
+	@EditorType(TypeMillisDiff.class)
 	public volatile long millisBetweenRemotePollWithoutPusher = TimeUnit.MILLIS_PER_SECOND * 10;
+	@EditorType(TypeMillisDiff.class)
 	public volatile long millisBetweenRemotePollWithPusher = TimeUnit.MILLIS_PER_MINUTE * 1;
 	
 	@EditorType(fieldName = "iOn")
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
index 2692fa91..d9e3cf23 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
@@ -130,14 +130,14 @@ public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbst
 		Collection<Object> additions = ContainerUtil.getAdditions(before, after);
 		if ( ! additions.isEmpty())
 		{
-			messages.add(Mson.prepondfix(mson("Additions: ").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) additions, sender), null));
+			messages.add(Mson.prepondfix(mson("Additions:").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) additions, sender), null));
 		}
 		
 		// Note: The result of getDeletions is not actually V, but the implementation doesn't care.
 		Collection<Object> deletions = ContainerUtil.getDeletions(before, after);
 		if ( ! deletions.isEmpty())
 		{
-			messages.add(Mson.prepondfix(mson("Deletions: ").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) deletions, sender), null));
+			messages.add(Mson.prepondfix(mson("Deletions:").color(ChatColor.AQUA), this.getValueType().getVisualMson((V) deletions, sender), null));
 		}
 		
 		message(messages);