Amend recent wmgenmenu changes