Fixes for numpy1.7 API
Fix for icpc