A few small fixes after the merge