Finished fixing compilation errors.