fixes for numpy 1.6 compatibility