Fix some comment bugs