More esp command fixes for windows