Fixed Build Bugs