AutoCapture improvements