Small worker improvements, hashtables in Master