Some bugfixes and tweaks for moderation functionality