Changes for comment bugs