HPC2N fixes to numpy