More optimizations to speedup interface terminals