Minor changes due to change in SVD