[1/2] Fix build errors