Fixed Effective C++ warnings