Fixes for depricated NUMPY version defines
A fix for numpy version string containing only 2 numbers