A few other fixes to whitelist.