Fixed some more build issue.
Fixed build.