F17 release: Last minute changes (NEEDED)!