Last minute fixes for the 1.60 release