#164 small fixes