Some final fixes before merge