Fix keys (again)

Forgot to include these two commits.