(Menu) Small cleanups