fix menu params and related variable references.