various small fix