fixing more entities