Updates for the 2.1 release