(Lakka) Fix two submenu bugs