Fix for g++ -Wall warnings