Fixing two weaknesses of the Spectral Method