small fixes before merge