Last changes pre 1.4