Ned/merge lti hotfix

Just the three changes we needed from the LTI fix.