#12 small fixes.