Bug fixes

Fix "menu lockup" issue
Fix "first startup freeze" issue