Final touches to 1.17 final