Small LTI fixes
Merge branch 'local'