Ned/merge lti hotfix

The three fixes we need from the LTI fix.