Fixes to simulation logic (to prevent collisions)