few small fixes