Fixed autofocus and validation