Further dynamics bug fixes