More fixes for svd.method = 'auto'