Some small changes before 1.6.0