Inconsistent functionality after updates

Other Total files issues: