Improved compatibility for old scan scripts