[no-task]: a couple of small bugfixes