[FIX] Removing some multi-TU problems.