Fix some worker behaviour