cosmetic
cleanup
fix crash on null default autostart property