Fixing missing classes in upstream/ Preparing to become a dependency.