More functions of Pervasives handled