Various boostrap/logcabin fixes.