hixie76 fixes from SvStefan! THX