fix(tasks): Partially fixed small issues, updated to use new api.

SD-650