Worker fixes