Shortcuts and resources fixes