Last changes before beta