Worker bugs fixed
Couple changes in API workers