Additional updates for 4.1