Small final fixes before merge