some small fixes for #83