Resolve compilation errors (2).