Apply fixes that came out of preparing for PR.