Final fixes before release