Tweaks for GCC 4.4

Review 1039 by @mlucy