small fixes around