Key allocation fixes.
Merge branch 'master' of github.com:frepond/elibart