Fixing messages (Still a bit spammy)