Fix insane non-local class / static field lookup
Fix typos in whitelisted classes

Also, fml.