Fixes for Official Repo inclusion

Fixes for Official Repo inclusion