TM load fixes (unstable)