small fixes after merge