Add needed repos & fix build error