Fixing more bugs for Hadoop; NumPy version on Gordon is lower than expected [ci skip]