Fix support for passthrough keys

Commit

5 years ago

Fix support for passthrough keys and add code to fix up ones mis-stored by the old code