Further adjustment to filestream handling