more workarounds for GCC 4.7