Refactor due to language changes, and deprecation warnings

Fixed a bunch of things that were breaking the build locally to unblock myself. Thought I would submit a PR.