More necessary fixes/changes for the official repo.