Try and fix issues with certain version of Numpy