Fix master to build TKP from main repos