More key changes

Fixes: #852