Whitelist and diff fixes: