fixing some entity and dao classes