A few small fixes