WPopupMenu fixes