improvements / bug fixes for autodetect