Some corrections (regex, etc...)