Minor fix on drop and comment commands generation.