This may be related to the following, in which I have posted some fixes:

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862 <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862>