ticket:10 fixes