Last changes before 0.15