Corrections for streaming and locker