Pull in changes from the full version of lib