Fixed fluid registration + conveyor not stopping for colliding entities