NaiveSVD/NaiveSVD: Corrected inheritance issues