NOTASK fix(misc)

- fix misc bugs left behind after refactor