Some fixes + spam reduction