Fixes for new PTE Import / Export