fix issues with non-existant entities