First pass at RSA corrections