motion command fixes