Fixed Build errors