fix(all): minor fixes