More gcc47 fixes.