Fixed Build Issues

hopefully this will work