Fix entity issues again