Minor movement improvements