Modifications to use libc++