Fixes for Notification Shortcuts