Fix broken commands