Update bugs found with 3.17 release