Fix some more problems
Merge branch 'master' of github.com:fd/simplex
WIP cas/btree