Final tweaks to adsi