esworker fixes