Fixed build errors.
Fixed build issues.