Build Errors Fix