small fixes
latest merge