Warning fix on entities