Potentially fixed object entity issues.