DIR command fixes