further improvements to setupdb