Updates from B&N 2.2 release