Fix items & fix whitelist