fix some regex expressions