More command fixes