Last fixes before merge