fixes from Arch, rel.13