More whitelist fixes