Linear modes work and converge at 2nd order. Added fixes to make sure
the code compiles with and without conduction.