Some fixing before release