various small fixes
build