Some comment system fixes