Just C++ Modernization and Static Initialization Fixes

Hope this works! Let me know.

Thanks!

Sam