Last fix and improvement before release