Development

Small worker related fixes.