a few small fixes