Various changes before merge