Starts fixing some entity classes.