Progress in fixing the autostart issue