fixed Apple related issues for parameter scan part of the code