Small changes before stable version