Ambiguous shortcuts fixed