Fix ambiguous shortcuts