Menu fixes for samples.