Fixed bugs from Debian upstream < 1.5-6