Even more command fixes.