Small changes before merge