[x] small fixes