Actually apply fixes to the correct files.
I always remember having done this long ago?!
Add other needed files so everything works as expected.