Web Worker fixes