Update methods copied from numpy more carefully