You might want to add the two patches I included in my package as they fix some important bugs. I have taken them from the upstream bug tracker.