CS fixes
Comment operations