fixes before merge