Fix samples for new Menu workflow