Fixed some whitelist issues