Last minute changes before feature log