#102 small fixes