some fixes to whitelisting/etc