[2.2] Fixed build errors