Updates for 4.2.1