Even more command fixes D: