ticket:35 small fixes