Fixed some issues with datastream fights