Made choice and svd Numpy 1.6 compatible.