Numpy 1.6 fixes

Closes #3660