Whitelist fixes