FIX: vsftp improvements from Rich Mellor on mailing list