Updates for the 2.3 release