Added missed Entity patches from MCPC legacy. Fixes #37