Fix broken/missing shortcuts