I cleaned up the patch.
Ignore that. I just wanted to copy that, but accidentically cut it.
New diff with better fixes.
Fixes for OS/2