Fixup from numpy removal