Worker tweaks and bugfixes