fixing some Entity variables