fix(all): minor bugfixes