Final updates for 2.1