Updates for modern incanter support