Patches sent from Vladimir Sekissov <svg@surnet.ru> applied manually