Network and user lib amendments