Minfixes on autodetect sample