Comment 4 for bug 50200

This patch is for an old package, not the latest. Feel free to recreate the patch, preferably by creating multiple small patches, each fixing one problem, posted on the corresponding bug reports.