Fixed whitelist bugs