Fix compilations problems in g++ 4.2.1 (Mac OS X)