Fixes for libstdc++