fix dynamics issues