Fixes for encryption from eperi