[2.1] Fixed Build errors