Fixes almost all issues in ##79763##