Bug #0108: Fix for working with gcc 4.7
Misc #0000: Manual update.