Last changes before 3.0 release