More fixes for compilation under gcc 4.7. Patch supplied by "oget". Fixes reopened...