Fixed several entity replacement bugs and entity property errors

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>