Better autofocus handling