DevStream: Fixing issues from last stream