DO NOT MERGE: Fixing Entities

"Busted" as in things are broken, or "busted" as in you got no logging output?