Fix Lightning NPEs