Key allocation problems.

Reported by Emil Natan. Using ManualKeyGeneration resulted in a keys in a strange state and a key allocation problem.

1) Investigate this further

2) Decide if we need a regular audit of the keys to catch strange states, or a more sophisticated key purge command.