Fixed Build Errors