hammy_worker fixes