fixes before merge with master