Fixed build after main repo split