More libstdc++ worarounds