- a few small fixes