Fixing libcxx compatibility issues