More work on crypto libraries