Fixing entity stuff.

Signed-off-by: Imalune <devimalune@gmail.com>