Updated to the latest standard libraries and made some forward progress
in restoring operation