Shortcuts : Avoid loop

+ Typos correction