a couple of small fixes after merge