Update for 4.1 compat