Small fixes, wellknown hosts support