update_all fixes for 4.1