various small fixed