Autotuner : some polishing