Linearisation fixes
Merge branch 'lin_correction'