few fixes from Elrond(elrond@samba-tng.org) and Billy O'Connor(billy@oconnoronline...