Fixed Build Issues