ticket:41 small fixes