Further updates to get the code building without errors on Windows and Linux.