I wrote a fix for all mentioned problems - please see the file in my fork.