Last changes before stage upload