More default whitelist tweaks