Small changes to whitelisting