Minor changes on shortcuts