Final changes pre 1.4 release