Import the following changes from libc: