[Finishes #80000304] fixe a few file owner issues and fix types.