Necessary fixes/changes for the official repo.