- Fix Entity patch lines