Fixing compilation errors.
Finish fixing compilation errors.