small fixes after last merge