Fixes for rsa