Official Repo Fixes