Fixed some warnings when using -Weffc++ gcc option