Minor changes

Still not working, it looks like a bug in libcxx.