Cleanup and fix streams management