Update for new stdlib changes