I restored these 2 files to their previous versions while we can try to discover what went wrong.
I will send a new pull request with these files corrections at a later time.