Last fixes before release