Fixed some issues in Entity.java