Fixing menu crashes