More GCC 4.4 fixes, v0.13.7