fixing the vanilla command classes (except teleport)