Fixed items that were missed when refactoring due to changes to Spectrum().
Merge remote-tracking branch 'origin/master'