Fixed some functions and removed some class from the streamings