Uniformize requirements
Fix library use