small fixes for #207, #191, #194