bug fixes in dynamics