A few more fixes for #88.