Fixed the 3 broken entities