Fix some compilation errors with gcc 4.8.2