Entity fixes (botched them the first time).