Move away some more from crypto-api
Add some missing lift calls