Some small fixes for #29.