Fixes to compile with libc++