Add more numpy guards, since the original import guard was removed