Fixed Build Issues

Fixed build Issues