Fix Numerous Numpy errors