ticket:69 small changes