Minor tweaks
Fixed handling of AutoPlay/ContextMenu.Verb