Fix dynamics problems