Fixes some menu functions