applied some fixes to the nondeterministic motion plugins