Fixed build errors
Fixed build errors