Added more command fixes.