Dynamo worker fix and improvement