Fixed some more spamming issues.