Some changes in gsub rules