more fixes from root@sh-r.info