Improved scanning speed and fixed PE scanning