Fixed a few 2024 errors