Minor simulation bug fixes.